* ocaml-source: install ocaml tarball as

  /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously
  missing and make other packages FTBFS
* bump debhelper dependencies and compatibility level to 5

diff --git a/debian/changelog b/debian/changelog
index ff9ff3708f77616a8441e11b30e95c9195c5c6ed..a0fbb80420f097ef172f126721b0b3e3fcacb6ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml (3.10.0-5) UNRELEASED; urgency=low
+ocaml (3.10.0-5) experimental; urgency=low
 
   [ Ralf Treinen ]
   * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which
@@ -8,8 +8,12 @@ ocaml (3.10.0-5) UNRELEASED; urgency=low
   [ Stefano Zacchiroli ]
   * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
     FTBFS on arm
+  * ocaml-source: install ocaml tarball as
+    /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously
+    missing and make other packages FTBFS
+  * bump debhelper dependencies and compatibility level to 5
 
- -- Stefano Zacchiroli <zack@debian.org>  Wed, 25 Jul 2007 17:52:23 +0200
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 12 Aug 2007 19:29:07 +0200
 
 ocaml (3.10.0-4) experimental; urgency=low
 

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5

diff --git a/debian/control b/debian/control
index 83b74a9c2371740b103a60bd6c48e4bc53d557e2..adb6ba63751bbd7989f1f4620ccb05aa646ff13a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>, Stefano Zacchiroli <zack@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>, Samuel Mimram <smimram@debian.org>
-Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
+Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/

diff --git a/debian/ocaml-source.install.in b/debian/ocaml-source.install.in
index d50e30c004e97e72afcb892666b9ce175d462236..59039b90f041df4d18d9f6e6b6e1ae335e93a364 100644 (file)
--- a/debian/ocaml-source.install.in
+++ b/debian/ocaml-source.install.in
@@ -1 +1 @@
-debian/ocaml-#OcamlABI#.tar.bz2                /usr/src/
+debian/ocaml-source-#OcamlABI#.tar.bz2         /usr/src/

diff --git a/debian/rules b/debian/rules
index f4db989f67665a5e524068eddd5cac2f74a4f8cd..0d7131c2ded69dda8da53688968828b00223f6e0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ INSTDIR = $(CURDIR)/debian/ocaml-nox/usr
 
 NATIVE_ARCHS = $(shell cat debian/native-archs)
 DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR)
+SRCTARBALL = $(PACKAGE)-source-$(OCAMLMAJOR).$(OCAMLMINOR).tar.bz2
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -52,11 +53,11 @@ abi-sed-clean:
 debian/control:
        sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
 
-pre-config: debian/$(DISTDIR).tar.bz2
+pre-config: debian/$(SRCTARBALL)
        touch $@
-debian/$(DISTDIR).tar.bz2:
+debian/$(SRCTARBALL):
        ln -fs . $(DISTDIR)     # beware of the symlink recursion!
-       tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \
+       tar --anchored -chjf $@ \
                --exclude=$(DISTDIR)/$(DISTDIR) \
                --exclude-from=debian/ocaml-source.exclude \
                $(DISTDIR)/
@@ -139,7 +140,7 @@ endif
 
        dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh
        debian/rules abi-sed-clean
-       rm -f debian/$(DISTDIR).tar.bz2
+       rm -f debian/$(SRCTARBALL)
 
 install: install-indep install-arch
 install-indep: build-indep